Browse Source

主要维修文案修改

yunxing 4 years ago
parent
commit
33e1defaf7
1 changed files with 8 additions and 6 deletions
  1. 8 6
      src/views/equipment/table/wxTable.vue

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

@@ -3,7 +3,7 @@
     <div class='wx-list'>
         <div class='eq-list-top'>
             <el-input
-                placeholder='搜索设备名称或内码'
+                placeholder='搜索名称或内码'
                 size='small'
                 @keyup.enter.native='pageChanged(1)'
                 @blur='pageChanged(1)'
@@ -67,11 +67,12 @@
         <div ref='tableBox'>
             <el-table :data='tableData' :border='true' style='width: 100%' @row-click='innerTable'>
                 <el-table-column type='index' label='序号' width='60' :index='indexMethod'></el-table-column>
-                <el-table-column prop='sbmc' label='设备名称' show-overflow-tooltip resizable min-width='460'>
-                    <template slot-scope='{row}'>{{row.sbmc || '--'}}</template>
+                <!-- TODO: 设备/位置名称,内码修改ß -->
+                <el-table-column prop='sbmc' label='设备名称/位置名称' show-overflow-tooltip resizable min-width='460'>
+                    <template slot-scope='{row}'>{{row.sbmc || row.wzjc || '--'}}</template>
                 </el-table-column>
-                <el-table-column prop='assetnum' label='设备内码' show-overflow-tooltip resizable width='80'>
-                    <template slot-scope='{row}'>{{row.assetnum || '--'}}</template>
+                <el-table-column prop='assetnum' label='设备内码/位置内码' show-overflow-tooltip resizable width='80'>
+                    <template slot-scope='{row}'>{{row.assetnum || row.location || '--'}}</template>
                 </el-table-column>
                 <el-table-column prop='matters' label='事项类型' width='180' show-overflow-tooltip resizable>
                     <template slot-scope='{row}'>{{row.matters || '--'}}</template>
@@ -243,7 +244,8 @@ export default {
             //输入框搜索
             getParams.data.keyword = ''
             if (this.sbjc) {
-                getParams.data.keyword += `${this.sbjc}:sbmc,assetnum;`
+                // TODO: 位置名称,位置内码
+                getParams.data.keyword += `${this.sbjc}:sbmc,assetnum,wzjc,location;`
             }
             if (this.matters) {
                 getParams.data.keyword += `${this.matters}:description,matters;`