Bläddra i källkod

下拉清空事件

zhulizhen1111 4 år sedan
förälder
incheckning
cba03b20f3

+ 1 - 1
package.json

@@ -17,7 +17,7 @@
         "axios": "^0.19.2",
         "core-js": "^3.4.4",
         "element-ui": "^2.13.2",
-        "meri-design": "^1.2.8",
+        "meri-design": "^1.3.2",
         "moment": "^2.24.0",
         "quill": "^1.3.7",
         "vue": "^2.6.10",

+ 2 - 1
src/components/Select/Select.vue

@@ -29,7 +29,7 @@
                     v-html="fakePlaceholder">
                 </span>
             </span>
-            <Triangle v-show="!clearable" :class="triangleClass"></Triangle>
+            <Triangle v-show="!clearable" :class="triangleClass" @click="handleInput"></Triangle>
             <Remove class="p-select-clear" @click.stop="clearAll" v-show="!hideClear && clearable"></Remove>
         </div>
     </div>
@@ -482,6 +482,7 @@ export default {
         * params event事件对象
         */
         handleInput (event) {
+            console.log(event)
             this.query = event.target.value || event.data || ''
             this.showPlaceholder = !this.query
             if (!this.dropInstance) return

+ 5 - 6
src/utils/plugins/components.js

@@ -325,16 +325,15 @@ var system = [
                             label: "门禁管理",
                             id: "RDQD2",
                             param: { tab_code: "rd01" },
-                        },
-                        {
-                            label: "BA楼宇智能化",
-                            id: "RDQD1",
-                            param: { tab_code: "rd02" },
-                        },
+                        }, 
                         {
                             label: "视频监控",
                             id: "RDQD3",
                             param: { tab_code: "rd03" },
+                        },{
+                            label: "BA楼宇智能化",
+                            id: "RDQD1",
+                            param: { tab_code: "rd02" },
                         },
                     ],
                 },

+ 4 - 1
src/views/equipment/table/djspTable.vue

@@ -40,7 +40,7 @@
     </div>
 </template>
 <script>
-import Select from '@/components/Select/Select.vue'
+import { Select } from 'meri-design'
 import EqDetail from './eqDetaileDialog'
 import { queryShops } from '@/api/equipmentList.js'
 import { mapGetters } from 'vuex'
@@ -130,6 +130,9 @@ export default {
             if (newV !== oldV) {
                 this.getList()
             }
+        },
+        floor(){
+            this.getList()
         }
     },
     mounted() {

+ 10 - 1
src/views/equipment/table/eqDetaileDialog.vue

@@ -97,7 +97,7 @@
     </div>
 </template>
 <script>
-import Select from '@/components/Select/Select.vue'
+import { Select } from 'meri-design'
 import { mapGetters } from 'vuex'
 import { queryAsset } from '@/api/equipmentList.js'
 import { querySelect } from '@/api/public.js'
@@ -272,6 +272,15 @@ export default {
                 this.tabFind()
             },
             deep: true
+        },
+        sbglgs(){
+            this.queryTableList()
+        },
+        status(){
+            this.queryTableList()
+        },
+        floor(){
+            this.queryTableList()
         }
     }
 }

+ 12 - 11
src/views/equipment/table/eqListTable.vue

@@ -20,7 +20,7 @@
                 v-model='keyword'
                 style='width:192px;margin-right:12px'
             ></el-input>
-            <Select @change='getList' v-model='floor' style='margin-right:12px;' width='120' tipPlace='top' caption='楼层 :' :selectdata='floorSelect'></Select>
+            <Select @change='getList' @cancel='getList' v-model='floor' style='margin-right:12px;' width='120' tipPlace='top' caption='楼层 :' :selectdata='floorSelect'></Select>
             <el-input
                 placeholder='搜索生产厂商'
                 clearable
@@ -33,19 +33,19 @@
         </div>
         <el-table :data='tableData' style='width: 100%' :border='true' @row-click='rowHandle'>
             <el-table-column type='index' label='序号' width='60'></el-table-column>
-            <el-table-column prop='type_name' label='设备名称' show-overflow-tooltip resizable width="250">
+            <el-table-column prop='type_name' label='设备名称' show-overflow-tooltip resizable width='250'>
                 <template slot-scope='{row}'>{{row.type_name || '--'}}</template>
             </el-table-column>
-            <el-table-column prop='sl' label='数量'  width="100">
+            <el-table-column prop='sl' label='数量' width='100'>
                 <template slot-scope='{row}'>{{row.sl>=0?row.sl:'--'}}</template>
             </el-table-column>
-            <el-table-column prop='brand' label='品牌' width="120">
+            <el-table-column prop='brand' label='品牌' width='120'>
                 <template slot-scope='{row}'>{{row.brand || '--'}}</template>
             </el-table-column>
-            <el-table-column prop='sbxh' label='型号' show-overflow-tooltip resizable width="150">
+            <el-table-column prop='sbxh' label='型号' show-overflow-tooltip resizable width='150'>
                 <template slot-scope='{row}'>{{row.sbxh || '--'}}</template>
             </el-table-column>
-            <el-table-column prop='floorcode' label='楼层' width="100">
+            <el-table-column prop='floorcode' label='楼层' width='100'>
                 <template slot-scope='{row}'>{{row.floorcode || '--'}}</template>
             </el-table-column>
             <el-table-column prop='wzjc' label='安装位置' show-overflow-tooltip resizable>
@@ -73,7 +73,7 @@
     </div>
 </template>
 <script>
-import Select from '@/components/Select/Select.vue'
+import { Select } from 'meri-design'
 import EqDetail from './eqDetaileDialog'
 import { queryEquipmentList } from '@/api/equipmentList.js'
 import { mapGetters } from 'vuex'
@@ -119,11 +119,9 @@ export default {
                 major: this.major
             }
             //下拉
-            if (this.floor) {
-                console.log(this.floor)
+            if (this.floor) {             
                 postParams.gname = this.floor
             }
-            console.log(this.floor)
             //输入框搜索
             data.keyword = ''
             if (this.keyword) {
@@ -138,7 +136,6 @@ export default {
             if (data.keyword == '') {
                 delete data.keyword
             }
-
             queryEquipmentList({ data, postParams }).then(res => {
                 //console.log(res)
                 this.tableData = res.data.data
@@ -152,6 +149,10 @@ export default {
             if (newV !== oldV) {
                 this.getList()
             }
+        },
+        floor(newV, oldV) {
+            console.log(newV, oldV)
+            this.getList()
         }
     },
     mounted() {

+ 4 - 1
src/views/equipment/table/otherTable.vue

@@ -26,7 +26,6 @@
                     end-placeholder
                 ></el-date-picker>
             </div>
-
             <Select
                 width='180'
                 tipPlace='top'
@@ -87,6 +86,7 @@ import { queryQtsx } from '@/api/equipmentList.js'
 import { mapGetters } from 'vuex'
 import { formatter, number_format } from '@/utils/format.js'
 import { querySelect } from '@/api/public.js'
+import { Select } from 'meri-design'
 export default {
     data() {
         return {
@@ -201,6 +201,9 @@ export default {
                 this.tabFind()
                 this.getList()
             }
+        },
+        handleresults(){
+            this.getList()
         }
     },
     mounted() {

+ 16 - 3
src/views/equipment/table/standTable.vue

@@ -20,7 +20,16 @@
                 v-model='keyword'
                 style='width:192px;margin-right:12px'
             ></el-input>
-            <Select @change='getList' v-model='floor' style='margin-right:12px;' width='120' tipPlace='top' caption='楼层 :' :selectdata='floorSelect'></Select>
+            <Select
+                @change='getList'
+                @cancel='getList'
+                v-model='floor'
+                style='margin-right:12px;'
+                width='120'
+                tipPlace='top'
+                caption='楼层 :'
+                :selectdata='floorSelect'
+            ></Select>
             <el-input
                 clearable
                 placeholder='搜索生产厂商'
@@ -73,9 +82,9 @@
 <script>
 import { queryEquipmentList } from '@/api/equipmentList.js'
 import EqDetail from './eqDetaileDialog'
-import Select from '@/components/Select/Select.vue'
-import { mapGetters } from 'vuex'
 
+import { mapGetters } from 'vuex'
+import { Select } from 'meri-design'
 export default {
     data() {
         return {
@@ -159,6 +168,10 @@ export default {
             if (newV !== oldV) {
                 this.getList()
             }
+        },
+        floor(newV, oldV) {
+            console.log(newV, oldV)
+            this.getList()
         }
     },
     mounted() {

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

@@ -24,7 +24,7 @@
                 @change='getList'
                 v-model='ischange'
                 style='margin-right:12px'
-                width='190'
+                width='200'
                 tipPlace='top'
                 caption='是否更换配件信息 :'
                 :selectdata='changeOption'
@@ -64,7 +64,7 @@
         </div>
         <el-table :data='tableData' :border='true' style='width: 100%'>
             <el-table-column type='index' label='序号' width='60'></el-table-column>
-            <el-table-column prop='sbmc' label='设备名称' show-overflow-tooltip resizable min-width="150">
+            <el-table-column prop='sbmc' label='设备名称' show-overflow-tooltip resizable min-width='150'>
                 <template slot-scope='{row}'>{{row.sbmc || '--'}}</template>
             </el-table-column>
             <el-table-column prop='assetnum' label='设备编码' show-overflow-tooltip resizable width='80'>
@@ -73,7 +73,7 @@
             <el-table-column prop='matters' label='重要事项记录' width='130' show-overflow-tooltip resizable>
                 <template slot-scope='{row}'>{{row.matters || '--'}}</template>
             </el-table-column>
-            <el-table-column prop='description' label='描述' show-overflow-tooltip resizable min-width="150">
+            <el-table-column prop='description' label='描述' show-overflow-tooltip resizable min-width='150'>
                 <template slot-scope='{row}'>{{row.description || '--'}}</template>
             </el-table-column>
             <el-table-column label='更换配件信息' align='center'>
@@ -125,7 +125,7 @@
 <script>
 import { queryWbsms } from '@/api/equipmentList.js'
 import { mapGetters } from 'vuex'
-import Select from '@/components/Select/Select.vue'
+import { Select } from 'meri-design'
 import inputDialog from './inputDIalog'
 import { formatter, number_format } from '@/utils/format.js'
 export default {
@@ -241,6 +241,9 @@ export default {
                 // this.tabFind()
                 this.getList()
             }
+        },
+        ischange() {
+            this.getList()
         }
     },
     mounted() {

+ 13 - 19
src/views/equipment/table/wxTable.vue

@@ -24,7 +24,7 @@
                 @change='getList'
                 style='margin-right:12px;'
                 v-model='ischange'
-                width='180'
+                width='200'
                 tipPlace='top'
                 caption='是否更换配件信息 :'
                 :selectdata='changeOption'
@@ -60,48 +60,39 @@
                     end-placeholder
                 ></el-date-picker>
             </div>
-            <input-dialog :type='3' @confirm='confirm'></input-dialog>
-            <!-- <el-input
-                placeholder='搜索工单编号'
-                size='small'
-                @blur='getList'
-                prefix-icon='el-icon-search'
-                v-model='wonum'
-                style='width:192px;margin-right:12px'
-            ></el-input>-->
         </div>
         <el-table :data='tableData' :border='true' style='width: 100%'>
             <el-table-column type='index' label='序号' width='60'></el-table-column>
-            <el-table-column prop='sbmc' label='设备名称' show-overflow-tooltip resizable min-width="150">
+            <el-table-column prop='sbmc' label='设备名称' show-overflow-tooltip resizable min-width='150'>
                 <template slot-scope='{row}'>{{row.sbmc || '--'}}</template>
             </el-table-column>
-            <el-table-column prop='assetnum' label='设备编码' show-overflow-tooltip resizable width="80">
+            <el-table-column prop='assetnum' label='设备编码' show-overflow-tooltip resizable width='80'>
                 <template slot-scope='{row}'>{{row.assetnum || '--'}}</template>
             </el-table-column>
             <el-table-column prop='matters' label='重要事项记录' width='130' show-overflow-tooltip resizable>
                 <template slot-scope='{row}'>{{row.matters || '--'}}</template>
             </el-table-column>
-            <el-table-column prop='description' label='描述' show-overflow-tooltip resizable min-width="150">
+            <el-table-column prop='description' label='描述' show-overflow-tooltip resizable min-width='150'>
                 <template slot-scope='{row}'>{{row.description || '--'}}</template>
             </el-table-column>
             <el-table-column label='更换配件信息' align='center'>
-                <el-table-column prop='ischangepj' label='是/否更换' width="80">
+                <el-table-column prop='ischangepj' label='是/否更换' width='80'>
                     <template slot-scope='{row}'>{{row.ismodel==1?'是':(row.ismodel==0?"否" :'--')}}</template>
                 </el-table-column>
                 <el-table-column prop='model' label='配件名称型号' width='100' show-overflow-tooltip resizable>
                     <template slot-scope='{row}'>{{row.model || '--'}}</template>
                 </el-table-column>
-                <el-table-column prop='sl' label='数量' width="80">
+                <el-table-column prop='sl' label='数量' width='80'>
                     <template slot-scope='{row}'>{{row.sl>=0?row.sl:'--'}}</template>
                 </el-table-column>
-                <el-table-column prop='cost' label='费用(万元)' width="80">
+                <el-table-column prop='cost' label='费用(万元)' width='80'>
                     <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>
                 </el-table-column>
             </el-table-column>
-            <el-table-column prop='brand' label='现场照片' width="80">
+            <el-table-column prop='brand' label='现场照片' width='80'>
                 <template slot-scope='{row}'>
                     <div style='cursor:pointer;color: #0091ff;' @click='clickPic(row.glsmsImage)'>{{row.glsmsImage?row.glsmsImage.length+'张':'--'}}</div>
                 </template>
@@ -112,7 +103,7 @@
             <el-table-column prop='sjjssj' label='验收时间' width='130'>
                 <template slot-scope='{row}'>{{row.sjjssj?formatter(row.sjjssj): '--'}}</template>
             </el-table-column>
-            <el-table-column prop='wonum' label='工单编号' show-overflow-tooltip resizable width="80">
+            <el-table-column prop='wonum' label='工单编号' show-overflow-tooltip resizable width='80'>
                 <template slot-scope='{row}'>{{row.wonum || '--'}}</template>
             </el-table-column>
         </el-table>
@@ -134,7 +125,7 @@
 import { queryWx } from '@/api/equipmentList.js'
 import { mapGetters } from 'vuex'
 import inputDialog from './inputDIalog'
-import Select from '@/components/Select/Select.vue'
+import { Select } from 'meri-design'
 import { formatter, number_format } from '@/utils/format.js'
 export default {
     components: { Select, inputDialog },
@@ -248,6 +239,9 @@ export default {
                 // this.tabFind()
                 this.getList()
             }
+        },
+        ischange() {
+            this.getList()
         }
     },
     mounted() {

+ 9 - 0
src/views/equipment/table/zwTable.vue

@@ -289,6 +289,15 @@ export default {
                 this.tabFind()
                 this.getList()
             }
+        },
+        sxjd(){
+            this.getList()
+        },
+        xm(){
+            this.getList()
+        },
+        lb(){
+            this.getList()
         }
     },
     mounted() {