manage-client 3.2.263 → 3.2.265

package/src/filiale/ningjin/GasStatistics.vue

@@ -148,15 +148,21 @@
                               :show-reset-button="reset">
                   </datepicker>
                 </div>
-                <div class="col-sm-2 form-group  flex-row" style="white-space: nowrap">
-                  <label class="font_normal_body">余额区间</label>
-                  <div class="row">
-                    <input type="text" style="width:27%" class="input_search" v-model="model.f_balance_amount_sta"
-                           condition="ss.f_balance_amount >= {} " placeholder="">
-                    <label class="font_normal_body"> ≤ x ≤ </label>
-                    <input type="text" style="width:27%" class="input_search" v-model="model.f_balance_amount_end"
-                           condition="ss.f_balance_amount <= {} " placeholder="">
-                  </div>
+                <div class="col-sm-2 form-group">
+                  <label class="font_normal_body">用气类型</label>
+                  <v-select :value.sync="model.f_user_nature"
+                            v-model="model.f_user_nature"
+                            :options="$parent.$parent.usernatures"
+                            condition="ss.f_user_nature = '{}'"
+                            close-on-select></v-select>
+                </div>
+                <div class="col-sm-2 form-group">
+                  <label class="font_normal_body">用气性质</label>
+                  <v-select :value.sync="model.f_gasproperties"
+                            v-model="model.f_gasproperties"
+                            :options="$parent.$parent.gasProperties"
+                            condition="ss.f_gasproperties = '{}'"
+                            close-on-select></v-select>
                 </div>
                 <div class="col-sm-2 form-group">
                   <label style="width:35%" class="font_normal_body">客户类型</label>
@@ -191,6 +197,7 @@
                 <th><nobr>二阶气价</nobr></th>
                 <th><nobr>三阶气价</nobr></th>
 
+                <th><nobr>用气类型</nobr></th>
                 <th><nobr>用气性质</nobr></th>
                 <th><nobr>期初余额</nobr></th>
                 <th><nobr>起方</nobr></th>
@@ -223,9 +230,9 @@
                 <th style="text-align:center"><nobr>{{row.f_stair2price}}</nobr></th>
                 <th style="text-align:center"><nobr>{{row.f_stair3price}}</nobr></th>
 
+                <th style="text-align:center"><nobr>{{row.f_user_nature}}</nobr></th>
                 <th style="text-align:center"><nobr>{{row.f_gasproperties}}</nobr></th>
 
-
                 <th style="text-align:center"><nobr>{{row.f_balance}}</nobr></th>
                 <th style="text-align:center"><nobr>{{row.f_last_tablebase}}</nobr></th>
                 <th style="text-align:center"><nobr>{{row.f_tablebase}}</nobr></th>
@@ -285,8 +292,8 @@
 <script>
   import {HttpResetClass, PagedList} from 'vue-client'
   import exportConfig from './config/exportConfig'
-  import * as Util from './../../Util'
-  import plugins from './../../plugins/GetLoginInfoService'
+  import * as Util from '../../Util'
+  import plugins from '../../plugins/GetLoginInfoService'
 
   let readySomething = async function (self) {
     await self.$MagLoadParams.loadParam()
@@ -437,14 +444,6 @@
       }
     },
     computed: {
-      getCondition() {
-
-        return {
-          condition: this.condition,
-          startDate:`${this.$refs.paged.$refs.criteria.model.startDate}`,
-          endDate:`${this.$refs.paged.$refs.criteria.model.endDate}`
-        }
-      },
       getstart(){
         return `开始时间：${this.$refs.paged.$refs.criteria.model.startDate} 结束时间：${this.$refs.paged.$refs.criteria.model.endDate}`
       },
@@ -491,6 +490,12 @@
       pricetypes() {
         return [{label: '全部', value: ''}, ...this.$appdata.getParam('气价类型')]
       },
+      usernatures(){
+        return [{label: '全部', value: ''}, ...this.$appdata.getParam('用气类型')]
+      },
+      gasProperties(){
+        return [{label: '全部', value: ''}, ...this.$appdata.getParam('用气性质')]
+      },
       gasState() {
         return [{label:'正常', value:'正常'},
           {label:'异常', value:'异常'},
@@ -500,6 +505,20 @@
         return [{label:'是', value:'是'},
           {label:'否', value:'否'},
         ]
+      },
+      getCondition () {
+        // var con = ""
+        // if (this.orgCondtionStr) {
+        //   con = `${this.$refs.paged.$refs.criteria.condition} and m.f_orgid in  (${this.orgCondtionStr})`
+        // }
+        // else {
+        //   con = `${this.$refs.paged.$refs.criteria.condition}and m.f_orgid in ('${this.$login.f.orgid}' )`
+        // }
+        return {
+          startDate: this.$refs.paged.$refs.criteria.model.startDate,
+          endDate: this.$refs.paged.$refs.criteria.model.endDate,
+          condition: this.condition
+        }
       }
     }
   }