manage-client 4.1.150 → 4.1.152

package/src/filiale/jinbin/sale.js

@@ -0,0 +1,7 @@
+// 分公司特殊组件页面注册
+import Vue from 'vue'
+
+export default function () {
+  // 收费查询
+  Vue.component('charge-query', (resolve) => { require(['./sale/businessquery/ChargeQuery'], resolve) })
+}

package/src/filiale/meihekou/UserGasAll.vue

@@ -167,11 +167,11 @@
                   <div class="col-sm-2 form-group">
                     <label class="font_normal_body" title="参数：设备类型">用气设备</label>
                     <v-select id="f_meter_brand"
-                              v-model="model.f_devices_type"
-                              :value.sync="model.f_devices_type"
+                              v-model="model.device"
+                              :value.sync="model.device"
                               :options='$parent.$parent.devicesTypes'
                               placeholder='请选择'
-                              condition="f_devices_type like '%{}%'" :search="false"
+                              condition="device = '{}'" :search="false"
                               close-on-select style="width: 60%">
                     </v-select>
                   </div>
@@ -208,6 +208,15 @@
                               close-on-select :search="false">
                     </v-select>
                   </div>
+                  <div class="form-group col-sm-2">
+                    <label class="font_normal_body">用户等级</label>
+                    <v-select v-model="model.f_user_level"
+                              placeholder='用户等级'
+                              :value.sync="model.f_user_level"
+                              :options='$parent.$parent.userlevel'
+                              condition="f_user_level = '{}'"
+                              close-on-select style="width: 60%"></v-select>
+                  </div>
                 </div>
               </div>
             </criteria>
@@ -442,6 +451,7 @@ import {HttpResetClass, PagedList} from 'vue-client'
         orgCondtionStr: '(' + this.$login.f.orgid + ')',
         orgid:[this.$login.f.orgid],
         usetypes: [{label: '全部', value: ''},{label: '是', value: `= '壁挂炉'`},{label: '否', value: `!= '壁挂炉'`}],
+        userlevel: this.$appdata.getParam('用户等级') ? [{label: '全部', value: ''}, ...this.$appdata.getParam('用户等级')] : [],
         zonesdata:''
       }
     },

package/src/filiale/meihekou/UserGasList.vue

@@ -224,9 +224,9 @@
 </template>
 <script>
   import {HttpResetClass, PagedList} from 'vue-client'
-  import UserGasEcharts from './UserGasEchartsList'
-  import * as Util from '../../../Util'
-  import plugins from '../../../plugins/GetLoginInfoService'
+  import UserGasEcharts from '../../components/webmeter/newwebmeter/UserGasEchartsList'
+  import * as Util from '../../Util'
+  import plugins from '../../plugins/GetLoginInfoService'
   import plugin from 'system-clients/src/plugins/GetLoginInfoService'
   let readySomething = async function (self) {
     self.$refs.paged.$refs.cri.model.startDate = Util.addDate(new Date(),-6).substring(0,10) + ' 00:00:00'

package/src/filiale/wenxi/MeterExceptionList.vue

@@ -539,7 +539,11 @@
                 })
             },
             clearmsg() {
-                this.$refs.paged.$refs.cri.model = {}
+              Object.keys(this.$refs.paged.$refs.criteria.model).forEach((key) => {
+                if(key !== 'f_error_level'){
+                  this.$refs.paged.$refs.criteria.model[key] = []
+                }
+              })
             },
             close() {
                 this.show = false

package/.gradle/buildOutputCleanup/cache.properties

@@ -1,2 +0,0 @@
-#Thu Jun 04 15:26:04 CST 2026
-gradle.version=9.3.0