manage-client 4.0.28 → 4.0.29-1

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "manage-client",
-    "version": "4.0.28",
+    "version": "4.0.29-1",
     "description": "经营管控模块前台组件",
     "main": "src/index.js",
     "directories": {

package/src/components/webmeter/gasAnalysis/WebmeterSettlementAnalysis.vue

@@ -9,7 +9,7 @@
                 <label class="font_normal_body">客户编号</label>
                 <input @keyup.enter="search" style="width:60%" type="text" class="input_search"
                        v-model="model.f_userinfo_code" placeholder='客户编号'
-                       condition="f_userinfo_code like '%{}%'" v-el:xq v-next-el='userinfocode' v-el:username
+                       condition="f_userinfo_code = '{}'" v-el:xq v-next-el='userinfocode' v-el:username
                 >
               </div>
               <div class="col-sm-2 form-group">
@@ -30,7 +30,7 @@
                 <label class="font_normal_body">&nbsp;&nbsp;&nbsp;表号&nbsp;&nbsp;&nbsp;</label>
                 <input @keyup.enter="search" style="width:60%" type="text" class="input_search"
                        v-model="model.f_meternumber" placeholder='表号'
-                       condition="f_meternumber like '%{}%'" v-next-el='meternumber' v-el:meternumber
+                       condition="f_meternumber = '{}'" v-next-el='meternumber' v-el:meternumber
                 >
               </div>
               <div style="float:right">

package/src/filiale/fugou/RecordInfoQuery.vue

@@ -493,6 +493,14 @@
                       condition="f_network_valve='{}'">
                     </v-select>
                   </div>
+                  <div class="col-sm-2 form-group">
+                    <label class="font_normal_body">调&ensp;压&ensp;箱</label>
+                    <v-select :options='$parent.$parent.adjustables'
+                              :value.sync="model.f_adjustable_id"
+                              close-on-select
+                              condition="f_adjustable_id = '{}'" placeholder='调压箱'
+                              v-model='model.f_adjustable_id'></v-select>
+                  </div>
                 </div>
               </div>
             </criteria>
@@ -710,6 +718,12 @@
                   <th>
                     <nobr>灶具信息</nobr>
                   </th>
+                  <th>
+                    <nobr>调压箱编号</nobr>
+                  </th>
+                  <th>
+                    <nobr>调压箱名称</nobr>
+                  </th>
                   <th>
                     <nobr>备注</nobr>
                   </th>
@@ -842,6 +856,8 @@
                 <td style="text-align: center;"><nobr>{{row.f_alarm_code}}</nobr></td>
                 <td style="text-align: center;"><nobr>{{row.f_maxdate}}</nobr></td>
                 <td style="text-align: center;"><nobr>{{row.f_devices_type}}</nobr></td>
+                <td style="text-align: center;"><nobr>{{row.f_adjustable_id}}</nobr></td>
+                <td style="text-align: center;"><nobr>{{row.f_adjustable_name}}</nobr></td>
                 <td style="text-align: center;"><nobr>{{row.f_comments}}</nobr></td>
               </template>
               <template partial='foot'>
@@ -930,6 +946,9 @@
     // self.$refs.paged.$refs.cri.model.endDate = self.$login.toStandardDateString()
     // await self.$refs.paged.$refs.cri.search()
   }
+
+
+
   export default {
     title: '综合档案信息查询',
     data() {
@@ -954,6 +973,7 @@
         thead: '',
         tfoot: '',
         defaultfield: [],
+        adjustables: [],
         //排序
         orderitem: 'f_residential_area desc,f_building desc,f_unit desc,f_floor desc,f_room desc,f_userfiles_id desc',
         orderFields: {
@@ -995,6 +1015,7 @@
       })
     },
     methods: {
+
       recombine (param) {
         // 条件拼接数据，多用于in （）。将数组转成字符串时加上单引号处理
         let str = ''
@@ -1096,6 +1117,16 @@
         this.meterbrands = [{label: '全部', value: ''}, ...brandArr]
         //初始化气表价格
         this.prices = this.$MagGetSaleParam.getPrices();
+        console.log('初始化调压箱', this.$MagGetSaleParam)
+        let arr = []
+        let filter = this.$login.f.orgid
+        this.$MagGetSaleParam.getAdjustable(filter).forEach((item) => {
+          let temp = {}
+          temp.label = `[${item.value.f_adjustable_id}]-${item.label}`
+          temp.value = `${item.value.id}`
+          arr.push(temp)
+        })
+        this.adjustables = [{label: '全部', value: ''}, ...arr]
       },
       async  getaddress(){
         console.log('开始获取小区')

package/src/filiale/fugou/config/exportConfig.js

@@ -673,7 +673,9 @@ export default {
     'f_devices_type': '灶具信息',
     'f_network_valve': '自动阀控',
     'f_defendcard': '防盗卡号',
-    'f_factory_date': '生产年月'
+    'f_factory_date': '生产年月',
+    'f_adjustable_id': '调压箱编号',
+    'f_adjustable_name': '调压箱名称'
   },
 
   compreConfigGY: {