manage-client 3.2.213 → 3.2.215

package/src/filiale/WEINAN/sale.js

@@ -1,52 +1,52 @@
-// 分公司特殊组件页面注册
-let specialComp = {
-  // 收费查询
-  'charge-query': (resolve) => { require(['./ChargeQuery'], resolve) },
-  // 其他收费查询
-  'other-charge-query': (resolve) => { require(['./OtherChargeQuery'], resolve) },
-  // 用户稽查查询
-  'inspect-list-user': (resolve) => {require(['./InspectListUser'], resolve)},
-  //换表查询
-  'meter-change-meter-query': (resolve) => {require(['./ChangeMeterQuery'], resolve)},
-  //补气查询
-  'fill-gas-query': (resolve) => {require(['./FillGasQuery'], resolve)},
-  //表具查询
-  'meter-query': (resolve) => {require(['./MeterQuery'], resolve)},
-  //表具档案综合查询
-  'record-info-query': (resolve) => {require(['./RecordInfoQuery'], resolve)},
-  // 业务查询
-  'business-manage':(resolve) => {require(['./BusinessManage'], resolve)},
-  // 换表查询
-  'change-meter-query':(resolve) => {require(['./manage/ChangeMeterQuery'], resolve)},
-  // 上报数据查询
-  'report-data-query':(resolve) => {require(['./ReportDataQuery'], resolve)},
-  // 上报统计分析--抄表分析
-  'user-gas-list':(resolve) => {require(['./UserGasList'], resolve)},
-  // 用气分析明细查询
-  'new-webmeter-user-gasAll':(resolve) => {require(['./UserGasAll'], resolve)},
-  // 用气分析图表分析
-  'user-gas-echarts':(resolve) => {require(['./UserGasEcharts'], resolve)},
-  // 启用查询
-  'enable-query':(resolve) => {require(['./EnableQuery'], resolve)},
-  // 停用查询
-  'disable-query':(resolve) => {require(['./DisableQuery'], resolve)},
-  // 销户查询
-  'cancellation-query':(resolve) => {require(['./CancellationQuery'], resolve)},
-  // 汇总查询
-  'collect-manage':(resolve) => {require(['./CollectManage'], resolve)},
-  // 开户查询
-  'new-account-query': (resolve) => { require(['./NewAccountQuery'], resolve) },
-  // 购气稽查
-  'inspect-list-gas': (resolve) => { require(['./InspectListGas'], resolve) },
-  // 档案合并查询
-  'merge-file-query': (resolve) => { require(['./MergeFileQuery.vue'], resolve) },
-  //地址管理
-  'user-address': (resolve) => { require(['./UserAddress.vue'], resolve) },
-  //地址变更记录
-  'user-address-change': (resolve) => { require(['./UserAddressChange.vue'], resolve) },
-}
-exports.specialComp = specialComp
-
-
-
-
+// 分公司特殊组件页面注册
+let specialComp = {
+  // 收费查询
+  'charge-query': (resolve) => { require(['./ChargeQuery'], resolve) },
+  // 其他收费查询
+  'other-charge-query': (resolve) => { require(['./OtherChargeQuery'], resolve) },
+  // 用户稽查查询
+  'inspect-list-user': (resolve) => {require(['./InspectListUser'], resolve)},
+  //换表查询
+  'meter-change-meter-query': (resolve) => {require(['./ChangeMeterQuery'], resolve)},
+  //补气查询
+  'fill-gas-query': (resolve) => {require(['./FillGasQuery'], resolve)},
+  //表具查询
+  'meter-query': (resolve) => {require(['./MeterQuery'], resolve)},
+  //表具档案综合查询
+  'record-info-query': (resolve) => {require(['./RecordInfoQuery'], resolve)},
+  // 业务查询
+  'business-manage':(resolve) => {require(['./BusinessManage'], resolve)},
+  // 换表查询
+  'change-meter-query':(resolve) => {require(['./manage/ChangeMeterQuery'], resolve)},
+  // 上报数据查询
+  'report-data-query':(resolve) => {require(['./ReportDataQuery'], resolve)},
+  // 上报统计分析--抄表分析
+  'user-gas-list':(resolve) => {require(['./UserGasList'], resolve)},
+  // 用气分析明细查询
+  'new-webmeter-user-gasAll':(resolve) => {require(['./UserGasAll'], resolve)},
+  // 用气分析图表分析
+  'user-gas-echarts':(resolve) => {require(['./UserGasEcharts'], resolve)},
+  // 启用查询
+  'enable-query':(resolve) => {require(['./EnableQuery'], resolve)},
+  // 停用查询
+  'disable-query':(resolve) => {require(['./DisableQuery'], resolve)},
+  // 销户查询
+  'cancellation-query':(resolve) => {require(['./CancellationQuery'], resolve)},
+  // 汇总查询
+  'collect-manage':(resolve) => {require(['./CollectManage'], resolve)},
+  // 开户查询
+  'new-account-query': (resolve) => { require(['./NewAccountQuery'], resolve) },
+  // 购气稽查
+  'inspect-list-gas': (resolve) => { require(['./InspectListGas'], resolve) },
+  // 档案合并查询
+  'merge-file-query': (resolve) => { require(['./MergeFileQuery.vue'], resolve) },
+  //地址管理
+  'user-address': (resolve) => { require(['./UserAddress.vue'], resolve) },
+  //地址变更记录
+  'user-address-change': (resolve) => { require(['./UserAddressChange.vue'], resolve) },
+}
+exports.specialComp = specialComp
+
+
+
+

package/src/filiale/zhongsheng/ChargeQuery.vue

@@ -147,12 +147,11 @@
                 </div>
                 <div class="col-sm-2 form-group">
                   <label class="font_normal_body">气价名称</label>
-                  <v-select :value.sync="model.f_price_name"
-                            v-model="model.f_price_name"
+                  <v-select :value.sync="$parent.$parent.f_price_name"
+                            v-model="$parent.$parent.f_price_name"
                             multiple
-                            :options="$parent.$parent.getPricenames"
-                            condition="f_price_name in {}"
-                            ></v-select>
+                            :options="$parent.$parent.getPricenames">
+                    </v-select>
                 </div>
                 <div class="col-sm-2 form-group">
                   <label class="font_normal_body">&nbsp;&nbsp;&nbsp;表编号</label>
@@ -789,6 +788,7 @@
      data() {
       return {
         IdCardInfo:'',
+        f_price_name:[],
         card:'',
         isSingleUser: null,
         startDate1:'',
@@ -1034,6 +1034,25 @@
         if(this.IdCardInfo!=''){
           args.condition +=` and f_idnumber='${this.IdCardInfo}'`
         }
+        let stringValue = ''
+        if(this.f_price_name.length > 0){
+          if (this.f_price_name.includes('非居民2.54')) {
+            for (var i = 0; i < this.f_price_name.length; i++) {
+              stringValue = stringValue + "'" + this.f_price_name[i] + "',"
+            }
+            stringValue = stringValue + "'非居民2.4'"
+            args.condition += 'and f_price_name in ('+stringValue+')'
+          }else {
+            for (var i = 0; i < this.f_price_name.length; i++) {
+              if (i === this.f_price_name.length - 1) {
+                stringValue = stringValue + "'" + this.f_price_name[i] + "'"
+              } else {
+                stringValue = stringValue + "'" + this.f_price_name[i] + "',"
+              }
+            }
+            args.condition += 'and f_price_name in ('+stringValue+')'
+          }
+        }
         this.model.search(args.condition, args.model)
         this.sumsmodel = this.$refs.paged.$refs.grid.model.sums;
         this.card=''