manage-client 3.3.214 → 3.3.215

package/package.json

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

package/src/components/SellReport/ManageSellType.vue

@@ -250,7 +250,9 @@ export default {
     }
   },
   computed: {
-
+    user_type () {
+      return [{label: '全部', value: ''}, ...this.$appdata.getParam('用户类型')]
+    },
     charge_state () {
       return [{label: '全部', value: ''}, ...this.$appdata.getParam('收费状态')]
     }

package/src/filiale/tongchuan/MeterQuery.vue

@@ -164,8 +164,9 @@
                     <label class="font_normal_body">气表状态</label>
                     <v-select :value.sync="model.f_table_state"
                               v-model="model.f_table_state"
+                              multiple ="true"
                               :options='$parent.$parent.tablestate' placeholder='请选择'
-                              condition="f_table_state = '{}'"
+                              condition="f_table_state in {} "
                               close-on-select></v-select>
                   </div>
 <!--                  <div class="col-sm-2 form-group">-->
@@ -261,8 +262,9 @@
                     <label class="font_normal_body">客户状态</label>
                     <v-select :value.sync="model.f_user_state"
                               v-model="model.f_user_state"
+                              multiple = "true"
                               :options='$parent.$parent.userstates' placeholder='请选择'
-                              condition="f_user_state = '{}'"
+                              condition="f_user_state in {}"
                               close-on-select></v-select>
                   </div>
                   <div class="col-sm-2 form-group">
@@ -334,8 +336,6 @@
                   <th>
                     <nobr>卡号</nobr>
                   </th>
-
-
                   <th>
                     <nobr>气价名称</nobr>
                   </th>

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

@@ -32,7 +32,8 @@ export default{
     'f_userinfo_code': '客户编号','f_user_name':'客户名称','f_user_phone': '客户电话','idnumber': '身份证号','f_address': '客户地址','f_balance_amount': '表上余额',
     'f_user_type': '客户类型','f_usetype': '使用类型','f_use_date': '使用日期','f_gasproperties': '用气性质','f_meternumber': '表号',"f_card_id":'卡号','f_price_name': '气价名称',
     'value': '气价详情','f_meter_brand': '气表品牌', 'f_meter_style': '气表型号',
-    'f_gas_person': '通气人','f_gas_date': '通气时间','f_input_date': '建表时间', 'f_table_state': '气表状态', 'isbgl': '是否壁挂炉','f_inputtor':'抄表员','f_book_name':'抄表册'
+    'f_gas_person': '通气人','f_gas_date': '通气时间','f_input_date': '建表时间', 'f_table_state': '气表状态', 'isbgl': '是否壁挂炉','f_inputtor':'抄表员','f_book_name':'抄表册',
+    'f_user_state': '客户状态'
   },
   ResidentialQuery: {
     'f_residential_area':'小区','hushu':'户数','xinhushu':'新建户数','f_oughtfee':'用气金额','f_oughtamount':'用气量',

package/.gradle/buildOutputCleanup/cache.properties

@@ -1,2 +0,0 @@
-#Wed Jun 19 10:24:15 CST 2024
-gradle.version=7.4